Revert "handle upgrading repositories initialized with --version=9"
authorJoey Hess <joeyh@joeyh.name>
Mon, 26 Sep 2022 16:17:50 +0000 (12:17 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 26 Sep 2022 16:17:50 +0000 (12:17 -0400)
This reverts commit 0d2e3058ee01d55dc3b929ddf8e0573a95a2ca85.

This commit accidentially caused repos that were initialized at v8 to
also upgrade to v10. There is nothing in the upgrade.log for such a
repo..

Upgrade/V9.hs

index 951feb9ab4d14d6ec5e7f987649cc8f2d5be4284..124e285498ccb8da6c06949e8d7a4cd712ad638a 100644 (file)
@@ -40,13 +40,12 @@ upgrade automatic
         - and it is not safe for such to still be running after
         - this upgrade. -}
        oldprocessesdanger = timeOfUpgrade (RepoVersion 9) >>= \case
+               Nothing -> pure True
                Just t -> do
                        now <- liftIO getPOSIXTime
                        if now < t + 365*24*60*60
                                then return True
                                else assistantrunning
-               -- Initialized at v9, so no old process danger exists.
-               Nothing -> return False
 
        {- Skip upgrade when git-annex assistant (or watch) is running,
         - because these are long-running daemons that could conceivably